fix booting
minor bugs