Dev

Fixed some minor bugs and updated requirements