Updated installation, fixed some minor bugs