Stripped trailing whitespace from asset package definition.
Trimmed more whitespace.
Fixed various bugs due to new architecture.