fixed bugs + modifications, final version before EAS
dunno.